Add last argument to t_type_register_static call.
authorAlexander Larsson <alexl@redhat.com>
Thu, 2 Nov 2000 15:38:04 +0000 (15:38 +0000)
committerAlexander Larsson <alexl@src.gnome.org>
Thu, 2 Nov 2000 15:38:04 +0000 (15:38 +0000)
2000-11-02  Alexander Larsson  <alexl@redhat.com>

* gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
Add last argument to t_type_register_static call.

* gdk/linux-fb/gdkdrawable-fb2.c:
Add last argument to t_type_register_static call.
export the get_image drawable virtual function.

* gdk/linux-fb/gdkimage-fb.c:
Add last argument to t_type_register_static call.
rename gtk_image_get to _gdk_fb_get_image and
export it for use by gdkdrawable-fb2.

* gdk/linux-fb/gdkprivate-fb.h:
export _gdk_fb_get_image.

* gdk/linux-fb/gdkselection-fb.c:
Add new api call stubs.

* gtk/Makefile.am:
Missing ( in linux-fb part.

* modules/linux-fb/Makefile.am:
Must link with gdk_pixbuf or get unresolved symbol.

19 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/linux-fb/gdkcolor-fb.c
gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkdrawable-fb2.c
gdk/linux-fb/gdkgc-fb.c
gdk/linux-fb/gdkimage-fb.c
gdk/linux-fb/gdkpango-fb.c
gdk/linux-fb/gdkpixmap-fb.c
gdk/linux-fb/gdkprivate-fb.h
gdk/linux-fb/gdkselection-fb.c
gdk/linux-fb/gdkwindow-fb.c
gtk/Makefile.am
modules/linux-fb/Makefile.am

index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index bf65c85e01fa21f3c8c7c8a6200842a57b96791e..f031d82e213503022a955254e3fdef0105074018 100644 (file)
@@ -1,3 +1,31 @@
+2000-11-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkcolor-fb.c, gdk/linux-fb/gdkdnd-fb.c,
+       gdk/linux-fb/gdkgc-fb.c, gdk/linux-fb/gdkpango-fb.c,
+       gdk/linux-fb/gdkpixmap-fb.c, gdk/linux-fb/gdkwindow-fb.c:
+       Add last argument to t_type_register_static call.
+       
+       * gdk/linux-fb/gdkdrawable-fb2.c:
+       Add last argument to t_type_register_static call.
+       export the get_image drawable virtual function.
+
+       * gdk/linux-fb/gdkimage-fb.c:
+       Add last argument to t_type_register_static call.
+       rename gtk_image_get to _gdk_fb_get_image and
+       export it for use by gdkdrawable-fb2.
+
+       * gdk/linux-fb/gdkprivate-fb.h:
+       export _gdk_fb_get_image.
+
+       * gdk/linux-fb/gdkselection-fb.c:
+       Add new api call stubs.
+
+       * gtk/Makefile.am:
+       Missing ( in linux-fb part.
+
+       * modules/linux-fb/Makefile.am:
+       Must link with gdk_pixbuf or get unresolved symbol.
+
 2000-11-01  Havoc Pennington  <hp@pobox.com>
 
        * gtk/gtktextbuffer.c (gtk_text_buffer_class_init): Use 
index 85851a8d796a91d200e18a8b8cdb87e3e2803fd9..4ad668696d785d787d2ddff8d44932f6c86cdc06 100644 (file)
@@ -94,7 +94,8 @@ gdk_colormap_get_type (void)
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
                                             "GdkColormap",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index a77fd5c1c08871b8a06e8cfc41c1675e5d6f77d2..6d18fe4474f8209007ef25b07c76c81e565e4cc2 100644 (file)
@@ -117,7 +117,8 @@ gdk_drag_context_get_type (void)
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
                                             "GdkDragContext",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index 413c4ab785b25cba96a00f4fe34936d8d9050b44..f5aa693f01585e22e186d9e5762176f4fdfd1df4 100644 (file)
@@ -127,6 +127,8 @@ gdk_drawable_impl_fb_class_init (GdkDrawableFBClass *klass)
   drawable_class->set_colormap = gdk_fb_set_colormap;
   drawable_class->get_colormap = gdk_fb_get_colormap;
   drawable_class->get_size = gdk_fb_get_size;
+  
+  drawable_class->get_image = _gdk_fb_get_image;
 }
 
 GType
@@ -151,7 +153,8 @@ gdk_drawable_impl_fb_get_type (void)
       
       object_type = g_type_register_static (GDK_TYPE_DRAWABLE,
                                             "GdkDrawableFB",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index fe55f6d4473bad1a80b081f25ad7ca5fa5aca8b4..b599500ff6339ed47406818afa8ce68e05dd9389 100644 (file)
@@ -60,7 +60,8 @@ GType gdk_gc_fb_get_type (void)
       
       object_type = g_type_register_static (GDK_TYPE_GC,
                                             "GdkGCFB",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
 
   return object_type;
index 717e1896f0d3e57f1e93f17093b3c892150fd746..beec927a4196df359c5c1e849924b298934779f7 100644 (file)
@@ -97,7 +97,8 @@ gdk_image_get_type (void)
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
                                             "GdkImage",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
@@ -150,11 +151,11 @@ gdk_image_new (GdkImageType  type,
 }
 
 GdkImage*
-gdk_image_get (GdkWindow *window,
-              gint       x,
-              gint       y,
-              gint       width,
-              gint       height)
+_gdk_fb_get_image (GdkWindow *window,
+                  gint       x,
+                  gint       y,
+                  gint       width,
+                  gint       height)
 {
   GdkImage *image;
   GdkImagePrivateFB *private;
index fba3fcad78db0cc71a95ca75216a7bc07f3fd715..bb5499bf13d661025baad8096e33dae3bddcfab1 100644 (file)
@@ -99,7 +99,8 @@ pango_fb_font_map_get_type(void)
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_MAP,
                                             "PangoFBFontMap",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
@@ -435,7 +436,8 @@ pango_fb_font_get_type (void)
       
       object_type = g_type_register_static (PANGO_TYPE_FONT,
                                             "PangoFBFont",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index f441d279fe1259a28a54952d50c631fdca7ce3e4..368bb02036c54602327e0570e8a77e5c3b5aa7a7 100644 (file)
@@ -104,7 +104,8 @@ _gdk_pixmap_impl_get_type (void)
       
       object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(),
                                             "GdkPixmapFB",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index 2f1a122ef27612b55194dd32f1a6b9f5eae40062..1967638aad712be3d4e89c9f4ed342a95cd5ede6 100644 (file)
@@ -202,7 +202,13 @@ void gdk_window_invalidate_region_clear(GdkWindow *window, GdkRegion *region);
 void gdk_window_invalidate_rect_clear(GdkWindow *window, GdkRectangle *rect);
 GdkGC *_gdk_fb_gc_new(GdkDrawable *drawable, GdkGCValues *values, GdkGCValuesMask values_mask);
 
-void gdk_fb_drawable_clear(GdkDrawable *drawable);
+GdkImage*_gdk_fb_get_image (GdkWindow *window,
+                           gint       x,
+                           gint       y,
+                           gint       width,
+                           gint       height);
+  
+void gdk_fb_drawable_clear (GdkDrawable *drawable);
 void gdk_fb_draw_drawable  (GdkDrawable    *drawable,
                            GdkGC          *gc,
                            GdkPixmap      *src,
index 75a59f48d49c8a6899a17b958c962945033daf7c..a9a0053e80f2ea65763a8d3d78aafbfd9df1286e 100644 (file)
@@ -102,3 +102,71 @@ gdk_string_to_compound_text (const gchar *str,
 void gdk_free_compound_text (guchar *ctext)
 {
 }
+
+/**
+ * gdk_utf8_to_string_target:
+ * @str: a UTF-8 string
+ * 
+ * Convert an UTF-8 string into the best possible representation
+ * as a STRING. The representation of characters not in STRING
+ * is not specified; it may be as pseudo-escape sequences
+ * \x{ABCD}, or it may be in some other form of approximation.
+ * 
+ * Return value: the newly allocated string, or %NULL if the
+ *               conversion failed. (It should not fail for
+ *               any properly formed UTF-8 string.)
+ **/
+gchar *
+gdk_utf8_to_string_target (const gchar *str)
+{
+  return 0;
+}
+
+/**
+ * gdk_utf8_to_compound_text:
+ * @str:      a UTF-8 string
+ * @encoding: location to store resulting encoding
+ * @format:   location to store format of the result
+ * @ctext:    location to store the data of the result
+ * @length:   location to store the length of the data
+ *            stored in @ctext
+ * 
+ * Convert from UTF-8 to compound text. 
+ * 
+ * Return value: %TRUE if the conversion succeeded, otherwise
+ *               false.
+ **/
+gboolean
+gdk_utf8_to_compound_text (const gchar *str,
+                          GdkAtom     *encoding,
+                          gint        *format,
+                          guchar     **ctext,
+                          gint        *length)
+{
+  return 0;
+}
+
+/**
+ * gdk_text_property_to_utf8_list:
+ * @encoding: an atom representing the encoding of the text
+ * @format:   the format of the property
+ * @text:     the text to convert
+ * @length:   the length of @text, in bytes
+ * @list:     location to store the list of strings or %NULL. The
+ *            list should be freed with g_strfreev().
+ * 
+ * Convert a text property in the giving encoding to
+ * a list of UTF-8 strings. 
+ * 
+ * Return value: the number of strings in the resulting
+ *               list.
+ **/
+gint 
+gdk_text_property_to_utf8_list (GdkAtom        encoding,
+                               gint           format,
+                               const guchar  *text,
+                               gint           length,
+                               gchar       ***list)
+{
+  return 0;
+}
index d0750dbf764806455a134ab693eb322cef9a859c..e12c165b3efd61b0ef748444a77bf0869540e5a5 100644 (file)
@@ -105,7 +105,8 @@ _gdk_window_impl_get_type (void)
       
       object_type = g_type_register_static (gdk_drawable_impl_fb_get_type(),
                                             "GdkWindowFB",
-                                            &object_info);
+                                            &object_info,
+                                           0);
     }
   
   return object_type;
index d8fea54f63d434a960dcb2f6cf73e62ee9805b46..23cea4d19972bd8dd029c9a1ef224fe772a9ddb4 100644 (file)
@@ -494,7 +494,7 @@ libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources)
 endif
 if USE_LINUX_FB
 libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
-libgtk_linux_fb_include_HEADERS = $gtk_target_headers)
+libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
 libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
 endif
 EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
index c6f191fd56904afe32e9621926e8e66d55a7e102..f56f4ba344f9f6aefaf7b81f81c8c45f37fbf052 100644 (file)
@@ -24,7 +24,7 @@ LDFLAGS = @STRIP_BEGIN@ \
 fb_basic_la_SOURCES = basic.c
 
 fb_basic_la_LDFLAGS = -export-dynamic -avoid-version -module
-fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3
+fb_basic_la_LIBADD = $(PANGO_LIBS) -L$(top_builddir)/gdk/.libs -lgdk-linux-fb-1.3 -lgdk_pixbuf-1.3
 
 if USE_LINUX_FB